Skip to content

Conversation

@hakonfam
Copy link
Contributor

Update to image-ify DTC_OVERLAY_FILE.

See nrfconnect/sdk-mcuboot#35

Signed-off-by: Håkon Øye Amundsen [email protected]

@SebastianBoe
Copy link
Contributor

SebastianBoe commented May 16, 2019

@hakonfam : The CI failure:

make[3]: *** No rule to make target '/jenkins_workspace/workspace/fw-nrfconnect-nrf_PR-774/mcuboot/zephyr/zephyr_final', needed by 'zephyr/signed.hex'.

Ah, I found the root cause.

As stated here (nrfconnect/sdk-mcuboot#34) we can't bump the nrf manifest MCUBoot revision until nrfconnect/sdk-zephyr#147 is merged.

I don't know how this should be solved, we can either await this until nrfconnect/sdk-zephyr#147 is merged, or revert nrfconnect/sdk-mcuboot#34.

EDIT: I think, in hindsight, I should have kept nrfconnect/sdk-mcuboot#34 in an umerged PR until nrfconnect/sdk-zephyr#147 was ready to be merged.

@mbolivar
Copy link

I don't know how this should be solved, we can either await this until nrfconnect/sdk-zephyr#147 is merged, or revert nrfconnect/sdk-mcuboot#34.

Since you've merged zephyr 147, does that unblock this?

@SebastianBoe
Copy link
Contributor

@hakonfam : Try rebasing to resolve the CI failure.

@CLAassistant
Copy link

CLAassistant commented Jul 2, 2019

CLA assistant check
All committers have signed the CLA.

@hakonfam hakonfam force-pushed the west-update-2 branch 2 times, most recently from 46bc411 to 0270771 Compare July 22, 2019 08:25
@hakonfam hakonfam requested a review from rlubos as a code owner July 22, 2019 08:25
@hakonfam hakonfam force-pushed the west-update-2 branch 2 times, most recently from 46bc411 to b2790d5 Compare July 23, 2019 10:50
@hakonfam hakonfam removed the DNM label Aug 15, 2019
Update to image-ify DTC_OVERLAY_FILE.

Signed-off-by: Håkon Øye Amundsen <[email protected]>
@wiminordic
Copy link
Contributor

The DESKTOP failure is unrelated, already present in master.

@SebastianBoe SebastianBoe merged commit 9514c4c into nrfconnect:master Aug 15, 2019
@hakonfam hakonfam deleted the west-update-2 branch May 31, 2024 13:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants